move more stuff around