deconsolidate, work on UI