OSCI Toolkit w/out custom AIC changes