Updated based on Toby's results.