fixed bug, added time