merge from nate's