image handling related changes