typo
move stuff around