More genpass skipping