2nd attempt at rebuild