Added settings back to tracking