Rebuild all, and now pass