modify some judgment, from "Ivan"