Added psetup argument