modified some changes