UI changes  + undef + unused