refactor session
spinner