Changed Tracker Functions parameter order