Calendar now filled in correctly