Somw changes

Change-Id: I15712549bdee2469e2325c8214be61e7dea58581
Signed-off-by: Andrey Shamis <lolnik@gmail.com>