Fixed species stuff hopefully for the last time