improve 3c stuff