Before conversion to C9