Attempt 1 of final build