also, I disagree with moving this logic here, it was cleaner previously.