some changes related to previous commit