Changes to the final build

Changes