I think the new stuff all works.