Connor revisions 2

Connor rev 2