updated for ols-0.9.7