Slight rewrite