working on new image architecture