Updated grid and TODO