finalish commit (mostly more cad)