put back tracking, made a few changes