merging last changes with ts3 plugin.