repositioned stuff a bit