Changes made to work without specific trackers