Update for the new UI