Build and reinsertion reimplemented