Additional work on client.js