1st commit plus Blak-KAT UI