More modifications for the TUI project