Fixed bugs related to lifting
resolved my own conflict