better raw support