Passport-Gen re-factor