changes as per code review
makes Sam's changes