changed UI and else