added categories and stuff