Branch 1 Final Update