Fixing sort, adding time slots