Fix timimng and add TRACE