added cylindrical movement / better oo