Final changes for operator