Working on MC UI PROBCORE-471