Final improvement in graphic plugin.