Sys tick refactor

ooops :dancers: