tracker state by push refactor