ADD DRY implemented
Merge with Eric's POUR fix