Got rid of code hacks for video demo