Updated with flat-UI