Revert "Revert opp changes"

This reverts commit 4329ec01ae98e92933c312bd2b71491cd589a2ce.