updated with ui changes