Added save on stop timer