improved trace for master