Fully working with new UI