changed to use jodatime