Add compy's fork