Just changed a few things for the fork.