improved plotting, removed mass method