Timer updates, still has problems