Surround OC with config