Merging Hector's changes