Branch 3 Final Update