Updated images to draw from same source. Removed makeshift tracking