Changed time handing, using moment.js library