Incorporate Will's changes