cleaned up Demo patch
