Updated for testing.
Updated with some testing.