Changed trace() calls back