code improvements
2.3.6