Moved to pun_attachment