moving back to tracking step times
refactoring
build