Some changes

Signed-off-by: Stas SIkorskyi <s777345@gmail.com>