Removing hard-coded countdown and using the delta