Updated ability to change operator