First build sort of 

Added different time calculation