added moment + date parsing