wip:modifications to guarantor related services