changes/additions to lifting + implemented throwing