changes based on PR inspection