Made much faster and a bit more species neutral