Reworking old plugin