Re-added code commented out of opl usage term