Added lever handling