some changes from automatic analysis