rearranged things without breaking anything (knock on wood, fingers crossed)