Taking over corrections from Paul Richardson
https://github.com/Paul-Richardson/LookOut/commit/9f7333231213c164c53044a8f1a76d552d7645f7