Added Dustin's updates.