Fixed Ben's blunders