Adding features to make the times work right