Updated For Reflection

Untested.