Updates from Connor

Connor updates