Tweaking calculation of time remaining for Guardian