Update new set of files. (working without bugs)

update some functionality but don't know how to work as a plugin.