Further optimized based on lack of splatting