updated for 3.9.10