Setting 17 with old water waves and creating 18 with new waves and simpler specular highlight