changes to moments to make date compalibtle