Changed things to account for category renaming