Implement David's corrections.