noe_plot refactored