added tracking, still need to adjust parameters