Associate with picture

more changes.