updating with code for new UI