Added beter trace