move some things around to support duo