Updated pre 4.0.5 build