Move to new plugin method
Fix aligning