refactor, make lift work