Adding tracings (still in progress)