Still modifying Operator files