Updated whole plugin