Pulling from Will's recent changes