Proper unit rebuild