some new changes

Signed-off-by: Dimitar Bankatev <dbankatev@gmail.com>