newer tracking bugs fixed