First draft ready for submit, need to clean prpr