refactoring
clean up
bug fix in lift_enters