latest changes from hwi