add changes for gui gen