some improvements
some improvements - part2