changes for PR feedback