final merge - seems pretty, except for plot