Make revisions based on feedback from Mathias