micro changes/refinements in service module along the way