Updated Operator Hook stuff