Sample/original image swapping (Update part 1)

Update split into two parts so that the differences color in correctly.