Readded over merged line, also removed fullscreen for demo purposes