Improved reflection, nearly done.