move some codde