restored old plugins with fixes