adding georges changes/dealing with weird git thing.  @6e0r9e