modified some things