yotam: elie's pull request, working on new design