Added Trace and delete