Changes from the wip fork