Improvements for angle and vel variation