Put in some of mauros feedback