#10 plugin changes.