Adding Hadlock stuff