Additional changes that I had missed out from the latest version.