image handling changed