Add changes for img space. (not added in prevoius commit)