moved parts a bit