Changes from Gamstc and Kiyumars