some changes to Category