Gridmap Revamp