Changed how grid works