Updated Grid and maps