merging David/Nates with Nates