UI, functionality updated
State before session with Thomas