Fixed so that time is saved