minor changes
merges pet generator???
merges pet generator