fix update and time management