refactored some of the categories