moved things out of the do