move some functions (no changes)