#349 Working on wording