latest puppet refactor