some change for edimg (2)