Add controller handling for leap