more progress on tracking