added tracking
finished hw6