iteration 2-1, added step definitions