Changed all dates to JodaTime