Last minute changes to Issue 2