3.1 Possible rebuild?