Changes made by Craig.