Update

Tracking working somewhat