changed time calculations to set persisted properties