EFIB 2018 Updates

* indicates required