updating with Emmanuel's image fixes.