Updated grid class