some changes for new taxonomy