latest changes working with Hector