switched to using moment