Updated Build pre 4.0.5