New category and fixes