still some issues with rotation left