Revert "merge changes"

This reverts commit f08dac652f0176a0e373d567cc8acaa05c524a21.
just poking around