Work on the service and js script