Replaced all of the service calls with a

new call that makes it more streamlined and cleaner code