Newer version of plugins

Both plugins were improved to work as our client asked us to do. He accepted them in that form.