text changes and new build system