Today
Re-add missing part of plugin lost with merge