Changes to bring into line with HMRC Docs
Merged master fixed conflict