Updated to generic version + SC