t# This is a combination of 2 commits.

dry it up