New working version, with Rama's plugin