TUI and a lot of changes...