Rearranging the traces just a little bit