Refactored code and added DD1 first build