Updated for GGX