GrandCanonical rework