all Service method fixed and now right