changed to some better puppet modules