Incorporate changes since third iteration meeting