updated to new operators