New version from upstream + Compat with my plugins