Added image swapping