rebuild, performance issues, manually merged