Final commit as DaiGUI