Rework Margins; add autos