Added some date manipulation