Changes to service.js