mergering nate's updates