Reorganized traces figures