updated parser and now returning image as well