+ small UI behaviour imp.