Much better image handling.