HWR extensive editing +some mkn changes