Updates 5-17

<