simplified: new code, new images