minor shuffling around