Got it working correctly for all angles !