Merge new GUI version