Made changes following first read-through