More puppet 3 goodness