Modified plugin again.