apply logic for new UI