added some changes - not important