Improved the leap control

Signed-off-by: jagracar <jagracar@gmail.com>