Trying to make the ending work a little better