Updated 4.17 version