added the seperated puppet setup