Add more words, don't redirect, and formatting