started removing the _THIS mentions and changing the operators