added categories and subjects