Updates by Freeman