Revised based on feedback from PUP-3563