Updated image handling.