Implemented some more steps