Undoing a few changes that created a strange bug
Demo ready