Modifications for testing new UI