Connor's changes