Operator written, todo removed