Updated with latest raytracing