UPDATED TO OC 0.6.9