Drunk Elephant Updates

* indicates required