add more functions into step counter
merge