I modified some things