merging Yoav's feedback on picture interop