Updates to server.js