Changed datasets

Now they use the correct category assignment, taking into account
CatAss variable (!)