some changes after work with judge