plugin fixed and ready for test