move stuff around a little bit