Adding 1st round of changes suggested by Trevor.