Undid my efficiency improvements for testing

Reverted back to Joe's original functions