updated names and grid