Made a few changes to day count