small changes

make order - some logic