Fixed the conflicts

This should incorporate Joe's changes.