Redoing images to not use EMW