[changed] some changes