rebuild working somewhat