Adjusted code

to reflect changes to categories.