added passport logic