updated for version 3.10.0