David A Smith

1st set of changes