modified some changes3