Need to reorder so that we can color the time correctly