changed some text to and from