Some changes and revert to Samsung sources