More work on time manager