Update props from 3.17