added Nathan's file and a few small changes