some more low-hanging fruit