Connor's stuff merged