changes based on 8.17 comments