adapt new UI logic