Added diagnistic trace