Synced with old plugin