36: move some code