modified some portion