edit class feedback from MOE

I guess this is much more complex and would be a bit tough for me to get at this time. I will come back to this in a few... :)