Final Build (Minor Amendments)