[changed] few little modifications