Address changes based on review comments and discussion