commit after merge and fix
accommodate review comments