switched to minute tick instead of MS timer
cleanup merge