3_17 update