added one more level of taxa and cleaner code