merge comments from Steven and John