Dave C's changes merged into the other app too