preparing for the UI improvements