New images, added timeouts