Improved U/I - more simple, clear, readable