added calendar and updated datetime format