more changes to track info by image as well