incorporates all comments from YX and JC