Addedd feedback and a suggestion from Nick

See the feedback section