first round of fixing images