Changes from Rizwan