Added B grade stuff