Update for thenerdery fork