change api session and registration
Merge branch 'hung'