I-17 improvements