I like @mtsgrd's changes.