Changes based on Hector's designs again