Tomb of Itmad-ud-Daula or pleasure garden

Considering number of goblet designs on the walls I wonder if there’s any credence to theory that it was really Jahangir ‘ s badahkhana which Nur Jahan converted into Itmaduddaula s tomb