Build Updates

New Updates for the flow of the application