working on passport solution