6.0 rebuild