PartialGrid added and Re-organized