changed to use moment for format