System/Gui merge Step 2