added step 3 - finished without the TODOs (waiting for Tomer)