Updated grid system