added some changes from Sharon