Added Traceur and better refreshing