Updated the full plugin coding from live