Added low level code to tracking