Made changes to follow cucumber