argh rearranging stuff