Updated to latest grid