Added nate's updates