Added some of Nathan's contributions