Improving image handling.