moving parts around a bit