Made changes as discussed on Thursday to Issue #9