Added Davin's Image Changes so we won't have to resolve conflicts