Made better for non-elegans species