More tidying up of pull request. Version defaults to 2.5 if not specified.