Stuff we changed to make our demo work