Switched calendar to joda time