more work on OC to 1.8