added step2 modifications