cleaned up and working demo/\