key building scripts improved