rebuilding

speedup added