changes on hector
merge