Integrate feedback from Thomas Lange (thanks for the review!)