Add missing file, improve MT selection
Remove flickering