changes based on comments on PR