Working version

Signed-off-by: y.shlapak <y.shlapak@samsung.com>