OP-4611 a group effort with thanks to Tony and Erik