correct trace...
adjustments...