Working on final plotting