Revamp of grid V2