integrated leap controller into current client