Beginning profiling tests
Hopefully more efficient
More efficient updating