Some changes

Signed-off-by: Fedorchenko M.I. <fmaksim74@gmail.com>