Better puppetization ...