trial at removing some duplication