small changes to srv and callback, not finished yet