some improvements for develop branch