work + time
work sorting by time
sorting fix