Change output now that I've learned some things. See changes.