added time formatting