Updated grid methods