Preparation for ui commit