Switched to Hash based grid