Changed to using moment instead of Date