finalised puppetmaster-jns