the image swapping works good now, no crop problems!