more editing and refinement