added everything except DPI data