that last commit was a bit broken for examples 1/2