[#18] Keep a puffin