updated for OPIC