More changes with a working build