Improvements and beginning of trace