Improved service.sh