A fire destroyed the shrine in 1354 but was rebuilt around 1358 by Jalairid Sultan Shaikh Awais Jalayir. He also interred his father's remains, Hasan Buzurg in the courtyard. Timur ordered the restoration of the shrine after a visit to Najaf. Suleiman the Magnificent also offered gifts, which probably helped restore the shrine, after a visit in 1534. The Safavid Shah Ismail I visited in 1508, but it was Abbas I who visited Najaf twice and commissioned 500 men to rebuild the shrine in 1623. The restoration was completed by his grandson Shah Safi al-Din in 1632. This restoration included a new dome, expanded courtyard, a hospital, kitchen, and hospice, so as to accommodate the numerous pilgrims. The cenotaph was restored in 1713 and the dome stabilized in 1716.