According to the Figus's opinion to modify some code