rebuild + smaller