Changed to dev branch, small grid changes