that's much tidier than the old code!