Changes to date output and if statements