Update from Cole's review 

Update from Cole's review