Further ammendments suggested by @wilmoore