(feat) applied some feedback from George.