Update to new bristol layout