changed time formatiing to JODA-Time