Change to how updates are handled, no more timer in background