Branch 2 Final Update