added some chang