sidescroll gone + redundancies removed