Add changes for jordanhatch