added time manager class
rebase fix