Updated with rasterization