updated for 3.17