Applying Kevin's changes.