Added replacing traces