New version to deal with FlickR changes