Some minor modifications to Branch 2