Switched from dateformat to moment