moved to using Joda Time instead of java.util.Date