moving my code out