reorganizing stuff a bit more vertically