Updated ray tracing