cleaned up Demo patch