Updated raytracer