modified some details