Changes from Shant.