simplify and rebuild