Added proper step count