edited up to the end of the categorisation section