modified some format