Updated puppetmaster