modified some inconvenient point