[leap refactoring]