3.1 rebuild