Connor added some changes