importing changes from my original plugin