merge, plot refactor, bmc added