Initial integration with new UI