update after samsung merge