nickh made some changes