Added Yannis edits from 5/20
edits prior to Yannis on 5/21