Rebuild w/ analytics