merged changes from the original plugin