Adding in some small ideas for changes