I merged in the BSC changes