Updated to the files from the nb8 branch from the praxis live repo.