After integrating the base UI