Continue to add in Hammerhead changes