Changed: removed forced vim movement for now