added UI handling