Revert "Revert "2 img changes""

This reverts commit 522af77bc825e456eaee121fc80e07f3eb88eb1d.