new data and UI improvement