updated for 5.3.17