Under Development with new UI Feedback