Updates to WORKING version of the modified plugin