added time management