follow up changes

follow up changes