add back oldraw for make_fit