Modified to work in conjunction with new build scripts.