modified some detail