Adding some of the suggestions by Ben