Prevent invalid turns and improved design