Modified a couple of methods to use the helper methods for converting Date to calendar