Slight rejiggering