use zones and moment, remove date