[changed] few changes, moving forward