Grand solution changes