more changes based on PR comments