-added some changes