improved reference
new service and controller changes