reorganizing and adding time
added time