Latest changes, fixed syntax error and now tracking properly.