Leap performance improvement