Fixed boundaries on Grid, improved efficiency.