modified some places