video stuff
solved merge conflicts