Issue 39 - all text updated