briang's changes with merge conflicts fixed

This should work for both of our changesets.