Minor change to OP logic, and move away from depricated Util method