merge in code needed for passport for review