changed some tuff