Incorporating points from Trevor King