Final Build by Herbert Merged