c07 stuff updated.