This is a pointer for @simong to make sure that updates this in his PR where pictures are wrapped in an object.