fixed table in line with new branching scheme