redoing UI and model