put jpeg-6 back for now for easier merge...