First refactor session