Made sure we divide up stuff better