moved everything into the body