[RFC] address comments from Richard

Richard addressed comments