integrating UI changes