move some stuff from core machine