Update old-code-mishmash