Updated with basic UI