13th Iteration

Fine tuning certain details, eliminating duplication