performace improvement
untested OPIC