add support for the picture passing.
commit the fix
fix the merge issues