improved opp calculator