Dealing a little better with syncing images