changed concept for plugin, removed comments