Updated code, images