These are actually Will's changes