Changing how Service works