Improvements to i3