Implement challenge and match with new UI