Improve location2cb section