Made puppet structure more sensible on advice from george