more changes based on PR