+ modify and add some py