Changes based on orgs feedback