moved some parts around