Resource Tracker Issue 83