modified some thangs