add ori changes of login combined with my changes of token