Improve image swap time