2D turn improvements