Carryovers from mac setup