updated grid system