- refactoring start/restart tracking