addes more categories and some changes for avoid big balls
resolve conflicts