new build without watch kit with fixes