Fixed Nate's changes.