Updating trace, still not working 100%