Adding Leap functionality