changes to service impl