Improved date formating
Changed add method to and added sub method