Changed image functionality.  Untested.