reorganized into new categories