model changes + image manager OK